From 97ef14b22496d5a024341e4dc5735b26231d25b1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 29 Aug 2005 05:06:18 +0000 Subject: [PATCH] Remove an accidentally leftover duplicate pixbuf creation. (#314700, 2005-08-29 Matthias Clasen * gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an accidentally leftover duplicate pixbuf creation. (#314700, Kjartan Maraas) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ gtk/gtkiconcache.c | 2 -- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd4b5b3cbd..dfa0830df5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-08-29 Matthias Clasen + * gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an + accidentally leftover duplicate pixbuf creation. (#314700, + Kjartan Maraas) + * gtk/gtksettings.c (settings_update_cursor_theme): Don't leak the cursor theme name. (#314693, Kjartan Maraas) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fd4b5b3cbd..dfa0830df5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-08-29 Matthias Clasen + * gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an + accidentally leftover duplicate pixbuf creation. (#314700, + Kjartan Maraas) + * gtk/gtksettings.c (settings_update_cursor_theme): Don't leak the cursor theme name. (#314693, Kjartan Maraas) diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c index 2af6958de7..d6f685065b 100644 --- a/gtk/gtkiconcache.c +++ b/gtk/gtkiconcache.c @@ -378,8 +378,6 @@ _gtk_icon_cache_get_icon (GtkIconCache *cache, return NULL; } - pixbuf = gdk_pixbuf_from_pixdata (&pixdata, FALSE, &error); - pixbuf = gdk_pixbuf_new_from_data (pixdata.pixel_data, GDK_COLORSPACE_RGB, (pixdata.pixdata_type & GDK_PIXDATA_COLOR_TYPE_MASK) == GDK_PIXDATA_COLOR_TYPE_RGBA, 8, pixdata.width, pixdata.height, pixdata.rowstride, -- 2.30.2